fixed merge (2)