didnt finish a merge conflict and accidentally committed it.