Resolve merge conflicts - keep enhanced agent implementation af99bf4 AgileAndy commited on Jul 13, 2025