as
conflict resolve
added new line of code
added from branch1
added code to see conflict
from branch1
hey