work-around to merge conflict