edited by din
conflict resolved