Test changes to binary file
change on ticket_456
fix conflict