fixed merge: