Client merging conflict fixed