Fixed the merger

AGAIN>>>>>>!>!!>!>