BUG: resolved conflicts with master