Checking in a conflict are you :wink: