conflict resolve
salary break up first
add: salary break up
merge mistake at routes corrected
migration file
partial commit