Added developer 2
Resolved conflict