improved long method
resolving conflicts