clean version so far
resolving conflict
using mine