conflict remote 2
merged remote1 into remote2