last commit was not fully merged