fixed merge problems

sisters pages that caused merge problems