fix my merge boo boo