sync with develop & resolve conflict