simple merge resolved conflicts