Get it running
Fix merge issue