bug fixes in labwork and imagework
resolving conflicts