Git, go MERGE YOURSELF !

Control Source Code