trying again
fixed basic merge conflicts