first commit
fixed merge issues