Canvis merge part 1