minor fix to conflict