Redoing my stuff…fixing merge