adapted theem
conflicts