Working with pull conflicts 11