merge conflict fixed
fixed merge and errors