fixing merging errors with or