Tried to solve some auto merging issues.