I think this is fixed

Fixed conflicts in LoadScreenActivity.java and it's XML