trying how merge conflict work