cleared folder to make way for automatic merge