Gandalf
Fix mergeconflict
fix 2:nd mergeconflict
fix 3:rd mergeconflict