fixing merging again