Fixed left over merge conflict notes