cleared out last bug resulting from merge
fixed merge conflict