add clarity and reslove conflicts