Better merge with partial resolving. Better monitor script. Added map on a single file.