Merge with develop and fix conflicts