is seems you didn't resolved conflicts right, please check this