I attempted to update an existing Galaxy repository run from release 18.01 to release 18.05
It throws the following error
config/galaxy.ini.sample: needs merge error: you need to resolve your current index first
I did convert galaxy.ini to yaml file with the command "make config-convert". Am I supposed to delete galaxy.ini.sample file?