Fixing error while auto merging.