Fix mergeconflict