Branch commit
Resolved conflict
Merging
Updated