fix namespace again
remove ActiveRecord
fix merge conflict