Resolve grassfield merge conflicts