alexs commit before erics and silas' commits
merged eric and silas' commits