Resolving conflicts and adding commit by UweSteinke