merging jamons pollute changes
Cleaned up conflicts