Turned some nasty hard coded variables into CLI args
Merge conflict solving