just my local modifications, carefull with migrations now
fixing conflicts