Musical finally worksgit add --all
musical merge fixed