Fix conflict markers