backing up i guess
merging
merge solved