First commit after merge
Additional comment before merge