got rid of conflicting migrations