First real commit
Fixed merge conflict