Fixed additional merge conflict