#178 issue fix conflicts