fix my merging errors