Fixing errors while auto merging.