settings merge-conflict resolved