attempt
Mandi's push and my pull, conflict removing