merged changes and fixed images