final stufffsss
fixed merge