comment out the git shortcuts until i figure out amp
merge fix