Update common.eyaml
Update common.eyaml

resolved a conflict

sebbASF/infrastructure-puppet,sebbASF/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet