End of Expression's development.
Fix conflicts.