still have not fixed merge error with git