fixed merge confilicts