Fixed Merge MapEngine