merges branches to working master