solved merging conflicts (hopefully)