Merge and fix git