oops, remove commited merge conflict files... :(