resolved some git conflict