Fix GPencil conflict