Fixes conflicting migrations