forgot to commit latest version
fixed merge conflicts