Remove merge conflict - we need to review the last commit anyway