got rid of extra space on right
fixed merge conflict