Removed temp file from last merge