confict markup in commit