#Most of the time, I don't think the same problem as me occured, but I leave a message for someone just in case like me.There was an infinite conflict message, so I definitely controlled conflict , but there was a warning of conflict again!! . "Unresolved conflict remaining." The interesting part was that GraphFragment was definitely my part, so Modified has to come up, but nothing came up like ..