resolving conflicts due to __init__ file