git : Please move or remove them before you can merge