why is git broken
merging