silence deprecation warning
resolve conflicts