lab desktop has complex conflicts - saving changes on mac