my bad, forgot to remove on < after merge