merge conflict demo