merge with homer