restoring repo history
fixing merge conflicts