Fixing git buggy merge