Manually merge Employee branch into Master branch