Replace getter and setter by methods.
Fix conflict