delete all merge-conflicts, now it is working