Resolved merge conflict
Added traling newline