fixed some git conflicts