merging errors...fixed?