Seems like rebase gone in wrong way with those files, right?