merged local and remote docker funcitonality
fixed merge conflict