fix: actually swap merge order so project is added before user

Previous fix only changed comments, not logic. Now project agents are
added to the map before user agents, so project takes precedence.