Fixed merge issues
Fix ignore_master and passwordless ssh