Continue work.
Perform merge after fixing conflifcts