merging errors..