fimc: merge fix