Merged conflicts 2