First Commit
Fixed merge conflicts