Merge "Remove a newline to prevent a merge conflict"