private methods instead of public
Resolved conflicts