poopy merge conflicts