merge issues
fixed merge conflicts
building fix