show something
Fix conflict and added my changes
some more changes