Fixed: Strange MERGE