#1 conflict commit test