Fixed some bugs caused by conflicts