have fixed the conflict between master and local develop/remote_branch