Fixed mergeconflict