Easier way to handle Merge Conflicts