before remote merge
Git merge fix brcp conflict