Fixing newline
Merging