hotfix mergeconflict