Inital Commit
Fixed Conflicts