Fix conflict problems