made beautiful
fixed conflict
now merged
test change branch etc
merge conflict resolved