Adding for_concrete_model=False in order to get different contenttype when using Proxy models
Fixing little issue with non-yet-deprecated merge method