Before merging
web merged
Conflicts resolved
'Conflict'
Checking R in windows
Logging changes
Solved merge conflicts; ignoring logs