fixing hellish merge