commit by Mikkel
fixed merge conflict