Edited by Thor
fixed conflicts