Some changes to commit and merge
fixing conflicts and commiting new stuff