BUG: resolve conflicts with master