fixed merged conflicts