>>>>>>>>>>>
find bug
merge
Adding a fucking awesome features: temporary conj
x
resolve conflict
resolve conflict
resolve conflict
resolve conflict
fix lion bug
update sv