agatablue: confilict commit