First commit
Fixed merge issue