git setup
merge fix