fixing awkward blank line problem
fixing merge