Fixed problems in the file resulting from a previous merge conflict.