Getting rid of the merge problems.