fixing gits crazy merge