Remove stupid files
Delete stupid merge files