Bad at merging is git