I Have a case where we are Three Developer working on existing project all have Different role to work on the code
1st Developer working on Current Task, 2nd working on bugs and all, and Third is Redesigning Code but once we start merging we are getting too many conflicts, and its taking too much time to merge so we have to do it manually at last.

guys please suggest better way to achieve it Thank you in Advance. this will really a great help if found any solutions.

I have Tried manual merge that asking to Developer that what code we need to keep or what we need to remove after this method we got solution but its very time consumable. and i am expecting any tools or method that can resolve this problem.