made a non-conflicting commit