Fixed merge weird git dropping 1 line: accept_nested_attributes_for which is important GIT! you hear me?! its important!