Commit in master
Commit after resolving conflict
add line4 in master