user 2 committing f1, f4
merge of f1