Activities
conflicts fixed