fix conflict while merging developer branch