Removing the <<<<HEAD from readme