[Ideas] Improve Merge

Most of times, the merge tool should be automatic...

If one developer has change one screen and other developer a diferent one, why should i have to merge the two versions?

Anyone familiar with CVS, SVN, GIT, etc will agree with me!