Deleted some merge artifacts