fixing merge boo boo