fix merge issues and update README