Method View
Conflicts Solved