Solved merge conflict

Solved merge conflict