fixing the merge conflict
fixing the merge conflict

winkerVSbecks/batarangle,rangle/batarangle,kushwahashiv/batarangle,winkerVSbecks/batarangle,rangle/batarangle,vanessayuenn/batarangle,rangle/augury,clbond/augury,vanessayuenn/batarangle,kushwahashiv/batarangle,rangle/batarangle,vanessayuenn/batarangle,rangle/augury,kushwahashiv/batarangle,rangle/batarangle,winkerVSbecks/batarangle,winkerVSbecks/batarangle,clbond/augury,clbond/augury,kushwahashiv/batarangle,clbond/augury,rangle/augury,vanessayuenn/batarangle,rangle/augury