alright, done with gamma-m1-m4
doing this in order to merge
done with merge