fixed merge conflict

Author git <vivec@telvanni.eu>
Author date 2018-02-10 19:26:36
Author local date 2018-02-10 20:26:36 +0100
Committer git <vivec@telvanni.eu>
Committer date 2018-02-10 19:26:36
Committer local date 2018-02-10 20:26:36 +0100
Commit a11b09f125c370bd641e9b3bb8d851ee545e20a5
Tree 5e58d9c6f7bb9c7116f817681c0e2a2fd798e24d
Parent c78d91c33cced29ddb933a9681d95f714e036479
Parent 7dfdfd650005256adbc1f904429300e2ea02cf39
fixed merge conflict