Adding something on test2
Added something else here
Resolved conflict