Fix unresolved conflict and build errors
Fix unresolved conflict and build errors

tmckayus/oshinko-cli,crobby/oshinko-cli,radanalyticsio/oshinko-cli,tmckayus/oshinko-cli,radanalyticsio/oshinko-cli,tmckayus/oshinko-cli,crobby/oshinko-cli,crobby/oshinko-cli,radanalyticsio/oshinko-cli