Mine

<<<<<<< .working
     * Returns the Atom URL of the item.
     *
     * @param the item
     * @param absolute whether or not the URL should be absolute 
     */
    public String getAtomUrl(Item item,
                             boolean absolute) {
        return calculateItemUrl(item, factory.getAtomPrefix(), absolute);
    }

    /**
     * Returns the Atom URL of the user.
     */
    public String getAtomUrl(User user) {
        return calculateUserUrl(user, factory.getAtomPrefix());
    }

    /**
     * Returns the Atom URL of the user.
     *
     * @param the user
     * @param absolute whether or not the URL should be absolute 
     */
    public String getAtomUrl(User user,
                             boolean absolute) {
        return calculateUserUrl(user, factory.getAtomPrefix(), absolute);
    }

    /**
=======
     * Returns the Atom URL of the item.
     *
     * @param the item
     * @param absolute whether or not the URL should be absolute 
     */
    public String getAtomUrl(Item item,
                             boolean absolute) {
        return calculateItemUrl(item, factory.getAtomPrefix(), absolute);
    }

    /**
>>>>>>> .merge-right.r4415