Solve merge conflict #2