Interm merge; db conflict resolved while working on user_project association.