calendar plugin
conflicts merged