Repush changes, accidentally keep both lines of files when merge right then left