Cleaned merge conflicts