Cleaned up merge.strategy in v0.4-5