Removed erroneous merge file