trying to solve merge conflicts of doom