Final merge has been fixed