cleaned up conflicts
changes to employee, issuance, tool models, fixed views