resolve comflict-final bitmaps
resolve comflict-final bitmaps