cloned the repository
tries to fix merge error