comecando a processar commands
merging stuff
merge fixed