site updated
merge resolved
fixed merge issues and updated site