Conflict on bitbucket remote server but everything is up to date locally Conflict on bitbucket remote server but everything is up to date locally git git