new entry
new merge with master for new entry