Add merge task to handle existing trait definitions

Add merge task to handle existing trait definitions #251