why did you remove empty line? it should be kept for git merging conflicts