add atom merge-conflicts