Continue with the new feature
User 2 modify new branch
User 2 mod 2.0
user 1 modification
Conflic modified