First commit
Fixed merges