salary preview and statement
merge conflict resolved