add merge4ames
fixed untracked files