Fixed whitespace problem hindering automatic merge