fixed conflicts (LOL merge -s ours; push -f)