Address merge issues, add store images