cleaned up
fixed merge conflict