Merge prompts replaced my conflict files, and my phone stays current.