went in and changed entity file, updated some package names
resolving merge
completing merge