resolving conflict rebase scariness
fixed conflict for the umpteenth time