Fixed conflict
Component drawing