fix syntax issues with merging conflict resolution
fix syntax issues with merging conflict resolution

hydroshare/hydroshare,hydroshare/hydroshare,hydroshare/hydroshare,hydroshare/hydroshare,hydroshare/hydroshare