almost done
fixed merges