Fix error when resolving merge conflict.