Trying to fix git and other things.
Merge hell