How to resolve merge conflict? ( Inside Crio Workspace )

To resolve merge conflicts in Crio Workspace, kindly have an end to end look at the following video.