fixing things post merge