removed some blank lines
fixed conflict