First commit
Fixed conflicts
Fix merge