added registration of designation and department
merging files
Solving conflicts