Removing merge conflict.