After fixing conflicts committed api and delegate