Deleted duplicate method after resolving conflicts