Removed unnecessary commentary

Test for resolving conflicts