More git fixes after a bad merge