resolved cibflict
modified sample3