Conflict resolved
Have deleted backup files
spelling changed
hidden fields for leave types
edit part rexoveld
leave type issue completed
spelling errors completed