Solve deleted margins with Conflict