Clashing with new commit