Merge origin/develop and fix conflict.