Restored wrong merge and new files