final mergeconflict fixed!