Fix merge failed.