camera module added
conflicts resolved