changed 2 NF
fixing merge conflicts in 2NF