second commit
Fixed Conflicts.