april manual overwrite trying to merge